Skip to content

chore: merge upstream T3 Code through f9b19a7f - #176

Merged
ScriptedAlchemy merged 379 commits into
mainfrom
codex/merge-upstream-2026-11-21
Nov 22, 2026
Merged

ScriptedAlchemy merged 379 commits into
mainfrom
codex/merge-upstream-2026-11-21

Conversation

@ScriptedAlchemy

@ScriptedAlchemy ScriptedAlchemy commented Nov 22, 2026 •

Copy link
Copy Markdown
Owner

Why

The fork is missing 377 commits from pingdotgg/t3code since the last upstream sync. This completes the interrupted merge through upstream f9b19a7f855b7e10f057cab6b4bc17ea43188623, preserving fork main 39c7a875fc55df41dd5b3f877cf0aad3ee1f257a as the first parent and the upstream commit as the second parent.

Changes

  • Integrate upstream updates while retaining the fork's providers, project memory, group conversations, inference integrations, and recent audit fixes.
  • Preserve migration files 1–125. Append upstream migrations as fork migrations 126–128 and recognize upstream receipt IDs 103–105 during reconciliation.
  • Fix merge regressions where attributed agent, linked-peer, or notification text was treated as a native slash command. Preserve steering, delegated follow-up tracking, and structured-output requests for those messages.
  • Preserve late-steer queue ordering and stop/hold recovery fixes, and repair a merged launcher fixture that replaced its supplied filesystem with the host filesystem.
  • Retain concise fork MCP descriptions while including upstream's new structured-output and related tool schemas.
  • Reconcile PR-watch setup failures with upstream: missing or unauthenticated host CLIs stop after the existing failure threshold with a safe, actionable notice. Generic failures, transport defects, rate limits, and watch-generation recovery retain the fork's behavior.
  • Update merged browser, Antigravity, and shortcut test fixtures to match the combined contracts and fork defaults.

Validation

  • Fork CI passed all 18 jobs on final head 91b3cbe, including all server and browser shards, package tests, builds, Rust, and mobile native checks. Agent Context Budget also passed.
  • 179 orchestration tests passed across command policy, steering completion, and delegated completion.
  • 93 migration and launcher tests passed; 8 platform-specific tests skipped.
  • 59 tests passed for structured-output command attribution and the latest upstream checkout guard, attachments, and folder-discovery changes. The new attribution regression was reproduced before the fix.
  • 536 agent-context and deterministic MCP evaluation tests passed; two offline evaluation request constructions passed.
  • Direct typechecks passed for server, web, mobile, desktop, contracts, and client runtime. After the CI fixes, all four affected packages (server, web, evals, scripts) passed again.
  • The follow-up fixes reproduced the three server regressions before correction; 14 PR-watch, 9 Antigravity, and 28 shortcut tests then passed. Both updated browser fixtures passed their hosted suites with all assertions retained.
  • Changed-file formatting, lint, both unused-code checks, GraphQL generation, dependency patch validation, project-memory native build, React compiler checks, and 375 cross-file checks passed.

The aggregate local check:changed run encountered the environment's nested-sandbox restriction in its cached typecheck runner; direct typechecks passed. Its lint process was killed during concurrent memory pressure and passed alone with one worker. The first hosted run identified the five integration failures corrected above. On the final head, an unchanged upstream browser-history suite hit its existing 15-second limit during slow iframe startup; one isolated Web4 rerun passed all 165 files and 1,258 tests. The history suite took 27.4 seconds on that rerun versus 61.1 seconds in the failed attempt. No assertions, timeouts, or CI rules were changed for the rerun. No live-model evaluation was run.

Context budget and existing CI baseline

The measured MCP catalog is 76,429 bytes across 110 tools, up 1,849 bytes (2.48%) from fork main; both provider instruction budgets are unchanged. The increase includes upstream structured-output support and new schema fields. The budget gate remains enabled.

Fork main already fails full-repository lint with 797 untranslated-copy violations in existing fork UI (baseline run). This sync does not suppress the rule or expand into that separate cleanup.

Model and harness: GPT-6 Astra Pro in ChatGPT/Codex, with three parallel review agents.

juliusmarminge and others added 30 commits November 20, 2026 14:54
…restarts (pingdotgg#39819)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…failing (pingdotgg#39899)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#39526)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dotgg#37122)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39926)

Co-authored-by: angrojo <angel.rojo24@estudiantes.uva.es>
…otgg#30407)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#38194)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dit (pingdotgg#33279)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#39903)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…39922)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#39653)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pauldupuyjr and others added 25 commits November 21, 2026 14:35
…tgg#40576)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40585)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ks (pingdotgg#40592)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40587)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40595)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#40594)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… is gone (pingdotgg#40627)

Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634)

Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40622)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…heckout (pingdotgg#38271)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#38542)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Integrate 377 upstream commits while preserving fork features and migration history. Keep attributed agent and peer messages separate from native provider controls across steering, delegated follow-ups, and structured output. Reconcile upstream migration receipts with fork migrations 126-128.
@changeset-bot

changeset-bot Bot commented Nov 22, 2026 •

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 91b3cbe

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@ScriptedAlchemy
ScriptedAlchemy merged commit a04700e into main Nov 22, 2026
36 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.